From 6f37f18c79b633b5d7a88b7d1559d51ce4a1a04c Mon Sep 17 00:00:00 2001 From: Ewan Mellor Date: Thu, 28 Dec 2006 12:59:58 +0000 Subject: [PATCH] Fix reboot of PV domains when both kernel and bootloader are unspecified (which is supposed to default to using pygrub). Signed-off-by: Ewan Mellor --- tools/python/xen/xend/XendConfig.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/python/xen/xend/XendConfig.py b/tools/python/xen/xend/XendConfig.py index 387bb8324c..54573d4f13 100644 --- a/tools/python/xen/xend/XendConfig.py +++ b/tools/python/xen/xend/XendConfig.py @@ -1106,6 +1106,11 @@ class XendConfig(dict): self['PV_kernel'] = sxp.child_value(image_sxp, 'kernel','') self['PV_ramdisk'] = sxp.child_value(image_sxp, 'ramdisk','') + if not self['PV_bootloader'] and self['PV_kernel']: + # We've set PV_kernel using the call above, so now we need to set + # PV_bootloader as well, otherwise we're going to do the wrong + # thing on reboot. + self['PV_bootloader'] = 'pygrub' kernel_args = sxp.child_value(image_sxp, 'args', '') # attempt to extract extra arguments from SXP config -- 2.30.2